Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix tsindex feb2024 #3403

Merged
merged 7 commits into from May 17, 2024
Merged

Fix tsindex feb2024 #3403

merged 7 commits into from May 17, 2024

Conversation

chad-earthscope
Copy link
Contributor

@chad-earthscope chad-earthscope commented Feb 3, 2024 •
edited by megies

What does this PR do?

Changses to the obspy.clients.filesystem.tsindex module:

  • More fixes to sqlalchemy 2.x warnings-turned-errors, in particular the need to use sa.text() for PRAGMA statements
  • Remove leap second file handling, unnecessary with current mseedindex
  • Fix tests for mseedindex >= 3.0.4 and remove leap second related tests
  • Rebrand IRIS -> EarthScope and fix URLs

Why was it initiated? Any relevant Issues?

SQLAlchemy failures during testing and new mseedindex program that handles multiple versions of miniSEED.
Note: the mseedindex package in PyPI is now up to date with the current release: https://pypi.org/project/mseedindex/ and likely how ObsPy users will get this program.

PR Checklist

  • Correct base branch selected? is now installable via PyPI: master for new features, maintenance_... for bug fixes
  • This PR is not directly related to an existing issue (which has no PR yet).
  • While the PR is still work-in-progress, the no_ci label can be added to skip CI builds
  • If the PR is making changes to documentation, docs pages can be built automatically.
    Just add the build_docs tag to this PR.
    Docs will be served at docs.obspy.org/pr/{branch_name} (do not use master branch).
    Please post a link to the relevant piece of documentation.
  • If all tests including network modules (e.g. clients.fdsn) should be tested for the PR,
    just add the test_network tag to this PR.
  • All tests still pass.
  • Any new features or fixed regressions are covered via new tests.
  • Any new or changed features are fully documented.
  • Significant changes have been added to CHANGELOG.txt .
  • First time contributors have added your name to CONTRIBUTORS.txt .
  • If the changes affect any plotting functions you have checked that the plots
    from all the CI builds look correct. Add the "upload_plots" tag so that plotting
    outputs are attached as artifacts.
  • New modules, add the module to CODEOWNERS with your github handle
  • Add the yellow ready for review label when you are ready for the PR to be reviewed.

@megies megies added this to the 1.4.1 milestone Feb 27, 2024
@megies megies changed the base branch from maintenance_1.4.x to master February 27, 2024 14:26
@megies
Copy link
Member

megies commented Feb 27, 2024

@chad-earthscope I think this is mixing changes that can go into maintenance_1.4.x..

  • rebranding
  • test fixes

.. with a change that should go into master instead:

  • functionality change, removing the leap second handling

Can we split this up?

(I changed the merge target branch to see what is actually going on in here)

megies
megies reviewed Feb 27, 2024
View reviewed changes
obspy/clients/filesystem/tsindex.py
sa.case((sa.literal(f) == '*',
sa.literal('5000-00-00T00:00:00')),
else_=sa.literal(f)
).label("endtime")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This part is different on the maintenance_1.4.x branch, so not sure what needs to be done exactly if it should go into 1.4.1

megies
megies reviewed Feb 27, 2024
View reviewed changes
obspy/clients/filesystem/tsindex.py
sa.case((sa.literal(f) == '*',
sa.literal('5000-00-00T00:00:00')),
else_=sa.literal(f)
).label("endtime")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here..

@megies
Copy link
Member

megies commented Feb 27, 2024

Besides these two parts above, the rest could be cherry-picked cleanly on top of a branch off of maintenance_1.4.x

@megies megies mentioned this pull request Apr 29, 2024
Merged
13 tasks
@megies megies modified the milestones: 1.4.1, 1.5.0 Apr 29, 2024
@megies
Copy link
Member

megies commented Apr 29, 2024

Cherry picked the rebranding for 1.4.1 and this can go in 1.5.0

@megies
Copy link
Member

megies commented Apr 29, 2024 •
edited

N.b. this PR should also unpin sqlalchemy in setup.py

EDIT: was done already in another PR

@megies
Copy link
Member

megies commented May 17, 2024

Rebased and force-pushed

@megies megies added .clients.filesystem build_docs Docs will be automatically built and deployed in github actions on pushes to the PR labels May 17, 2024
@megies
Copy link
Member

megies commented May 17, 2024

All tests pass after the rebase, so I'm assuming we're good to merge this

@megies megies added the ready for review PRs that are ready to be reviewed to get marked ready to merge label May 17, 2024
@megies megies merged commit e27eaff into obspy:master May 17, 2024
29 checks passed
@chad-earthscope
Copy link
Contributor Author

Thanks @megies, I owe you a beverage of your choice.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@megies megies megies left review comments

@nick-falco nick-falco Awaiting requested review from nick-falco nick-falco is a code owner

@trichter trichter Awaiting requested review from trichter

@d-chambers d-chambers Awaiting requested review from d-chambers

Assignees
No one assigned
Labels
build_docs Docs will be automatically built and deployed in github actions on pushes to the PR .clients.filesystem ready for review PRs that are ready to be reviewed to get marked ready to merge
Projects
None yet
Milestone
1.5.0
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@chad-earthscope @megies